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

Change-Id: I21e1683250d43cbc4c95ec748623b7368f8d4b28