am 7ccaba69: Merge "Update the path of the intent to unlock keystore." into honeycomb

* commit '7ccaba693bd328968baf3f117b286659ce4a2a75':
  Update the path of the intent to unlock keystore.