DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76 am: d20cad62 am: e62d4799 -s ours am: e9d2113a Change-Id: Id1d09fd582e8a213f49e215af708291dfc76bb78