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

Change-Id: I0d5a76517a5543aaf39426a5ed1d30976ccb05ed