Merge "Revert submission 1191937-art_apex_available"
am: ed3e33fee8

Change-Id: Id239bd3a736131bb3f237e346a7929094292bc77