[automerger skipped] Merge "Add Keystore get option that supresses caught...
[automerger skipped] Merge "Add Keystore get option that supresses caught exceptions warnings." am: f070b516 am: 7bf37cf8
am: 27369f99 -s ours
am skip reason: change_id I4bc86e3ea5b11027090fd3a27dc7455557cf66ab with SHA1 4a1cccc9 is in history
Change-Id: Ic30b5c553c22b9abfa5efd404cca5d82d6abb9a5