Merge "Fix/suppress system/security google-explicit-constructor warnings" am: 3a33d315bf am: eee44549d9
am: 0cb54159b5

Change-Id: Ife4bea4b5d02bee700cb343a37749eba24156201