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

Change-Id: Id922446864cb806ddca7f851669bf97754d271ab