DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54  -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7
am: 92d80b72aa

Change-Id: I872a35e35cf8a997108daad39447bbad36ccfcaf