DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921  -s ours
am: e9d2113af7

Change-Id: Id1d09fd582e8a213f49e215af708291dfc76bb78