DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c
am: 5d60a49d63

Change-Id: I1b0f66ccf915436637a804ff0517c431b2813ec8