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

Change-Id: I46d36b040e143dd5eedae7597ec7875ab920ac7b