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

Change-Id: I30c573bccf1f0e483d0881062c5b83a56b5080fe