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

Change-Id: I63283a1eb633103040617828e081f302c5ab9411