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

Change-Id: Id3ad165bcde54c25f6b4c397986611af1c4cdab5