Merge "Prevent installation of new APEX." into qt-dev am: 2b5de1f231
am: d7dd973054

Change-Id: Ie134ad221739b2ff2cb8a193504e8068e060e7ad