[automerger skipped] NIAP: Try to compute data if use keystore function fail...
[automerger skipped] NIAP: Try to compute data if use keystore function fail am: 5d1188ed am: 9bd119d0 -s ours am: f4f657ad -s ours
am skip reason: Change-Id I151dfe931aa80a0c9563d059b218ddfe37f653b2 with SHA-1 c1fb710a is in history
Change-Id: Iede7818712305236b6fdcc350653cfe129a5674e