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

Change-Id: Idf87b89b1100b2ddfefa5183378e21638ef1a9d5