Merge "Extend PS concealment/error treatment"
am: 58221178cc

Change-Id: I6f810d8e9734607abc6a9d520959edc53fdf17d6