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

Change-Id: I554c3b80214378d933e03ddae58eaa6bbcd5ae2f