Merge "Fix/suppress libs/gui google-explicit-constructor warnings" am: b0a8291275 am: c17263d064
am: 81bd3ff7bc

Change-Id: I3f97454ae419d6dd6f80c6b2f4e2cded8a2a75bf