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

* commit '956b9ed7fc20c4e1b03d794b0817dd08341ac229':
  Update the path of the intent to unlock keystore.