Merge "Add permission check before setMain()" into oc-mr1-dev am: 67744e4696
am: 5f68027506

Change-Id: Idb415b250c02a45eca76635c4d7ca0118ed612a3