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

Change-Id: I99bead7b3592d3a5072f278cddb3045b52ab9e22