Merge "Fix google-explict-constructor warnings in mtp." am: b480ab9365
am: c3fd10acaa

Change-Id: If352025948cdf3cbeb887a6d3dbbbb6fe369c243