DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am: ca7ffa06bc  -s ours

Change-Id: I306c63c1922f29f1df3cb225bd2d3153cadecaa3