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

Change-Id: I90d0e2f575f8291093e76d9b4908e3ff02e8f168