Merge \\"Fix google-explicit-constructor warnings in keystore.\\" am: 590a1dade7
am: d62c7277dc

Change-Id: I7658c6aaa0bc9ac8ebb31bf30697a54b1738bacb