Merge "[automerger skipped] Merge "Add Keystore get option that supresses caught exceptions warnings." am: f070b51670 am: 7bf37cf83d am: 27369f9928 -s ours am skip reason: change_id I4bc86e3ea5b11027090fd3a27dc7455557cf66ab with SHA1 4a1cccc938 is in history"