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

Change-Id: I794fb66edcc24246bc1acb8b46d28542ab8d570c