[automerger skipped] NIAP: Try to compute data if use keystore function fail am: cf9e5b52 -s ours
am skip reason: Change-Id I151dfe931aa80a0c9563d059b218ddfe37f653b2 with SHA-1 dfe410e7 is in history
Change-Id: I2da7392c6875a0717eba9eac54eb7856323847f0