Merge "Special handling of priv-apps in PMS." am: 107899c599 am: 15b0493360
am: 35455f2553

Change-Id: I8bfe46aad8166d4d4b7346fe10f3e148a34ccf0b