Merge "Fix/suppress incident* google-explicit-constructor warnings" am: 6af0e228f3
am: 78085ba0a3

Change-Id: Ie3676e133e4722762f44245a7a050971fa64105e