Merge changes from topic "remove-mp2-from-apex" into qt-dev
am: 285481dad4

Change-Id: I3c260d00053dba054e116e9c5090423a4bd5dc25