Merge "Stop capturing mtp_event by reference in lambda" into oc-mr1-dev
am: 840f6990fb

Change-Id: Ib619ca8a319db6541320c2330f53013f0cb6526c