Merge "Update the path of the intent to unlock keystore." into honeycomb