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

Change-Id: I8f9b514e8dc4f5591acba19b18d2e32501a38e31