Fixed two bugs that broke the keystore granting mechanism am: 3f30364811  -s ours
am: 51143c48f5  -s ours

Change-Id: Ie989874e3ecaed2eb7b96ec8f2102e6b79c63f81