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

Change-Id: I557d2a036bb1200349157c0cf872b10dc28f0164