Merge "Fix/suppress google-explicit-constructor warnings" am: c4f5492a93 am: 182fb759fd
am: 36cd6f415f

Change-Id: I7a5b1e463697e21fac731fce79ae8d9512d38fea