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

Change-Id: I26ef67a44b8c041900958bd7a33097c6052c073a