Merge "use HW Keystore" am: 8e7c212
am: f908abf

* commit 'f908abf7e1ec1c4f6aebb31593de79f13f82c489':
  use HW Keystore

Change-Id: I13e2dd691aea53ceb193f332ab909588ee64560e