Merge "Fix/suppress google-explicit-constructor warnings"
am: 14c95ecfeb

Change-Id: Ibf6b28c4fbfbfdb5485791b67dad1e9bda8d517c