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

Change-Id: I808cb92e6494780acbb61c26efc48bb265acdf99