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

Change-Id: I907fa44b6ab124f4b31a04212d06ff3e22cac567