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

Change-Id: Ie3d71c7d9b2cd2569857df70330bd1a83f3f3b8c