Merge "Fix issue: upgradeKeyBlob call always return PERMISSION_DENIED." am: 53b4ffad7e am: b0ea8ee642
am: e5482ecca8

Change-Id: Ie2a34b37d59a06cd1a5fa8a39dbbeaef94e25283