Merge "Fix explicit constructor warning from cpplint" am: 07577e3778
am: f313a54f02

Change-Id: I46d28921ce8631c3dfd0e7b18cd36aaf4a258a5e