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

Change-Id: I5df309f5dacb8c3d84b84ae5f284ac10a74f3ea1