[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 am: 6a557613 -s ours
am skip reason: Change-Id I151dfe931aa80a0c9563d059b218ddfe37f653b2 with SHA-1 c1fb710a is in history
Change-Id: I968822a25b0c39eddeb30b9a3655ce67df92a854