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

Change-Id: Ie2ee1d63a846a703bfeddc6dfbfd70a62bdded8a