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

Change-Id: I0eb6f2ed5005ce4cc7d2fa63172c28822b3b4985