Merge "Add Keystore get option that supresses caught exceptions warnings."
am: f070b51670

Change-Id: I5f229fc9d08e445c32ea8cf4e971129d79019cef