Merge "Adding config to disable temporary permission granting" into oc-dev
am: b65719af5e

Change-Id: Ic895b3b82bb0fcfc375354665b8779716f601dee