Fixed two bugs that broke the keystore granting mechanism

Bug: 65851049

Change-Id: Ibea71d42934d283c95729eca6772a9aadb949a6a
2 files changed