Merge "Allow only selected priv apps to run OOB" into pi-dev am: 792d36c170
am: 5c195ee292

Change-Id: I9aff6c33256745d6c8666365b402e7bd278257cb