Merge "Fix google-explicit-constructor warnings in gui and ui."
am: 170454b0fa

Change-Id: I1b95e35d622827f27b1637af00e312c055fd2c27