Merge "Revert submission 1191937-art_apex_available" am: ed3e33fee8 am: 71db35d85b am: 23ac48fb33

Change-Id: I2070c15fe1f0335e0cf9cec420f8fcb262aadf2c