Merge "Stop capturing mtp_event by reference in lambda" am: 0fdeb09e89
am: 1532a1d523

Change-Id: I749592a3683850806398e6c5e6c24a6bc93b00ee