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

Change-Id: Ic06515c81d9ca524c335eabeac4bee7e1e5e34b2