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

Change-Id: I0795bdb42836d84714fa6254149918a4bf49c1d3