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

Change-Id: I85e247ba4cc242528593b4d40a7f610e46acb608