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

Change-Id: I5abac5e03dcc61694e297c3ee6fd7d3c4b663333