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

Change-Id: I0746d8c8d32993e863802b14a0d4b758bc8e735d