Merge "Revert submission 1191937-art_apex_available" am: a857615390 am: 021e553041 am: 380eb231fc

Change-Id: I3a9e8458a609d30875f664062de9f1872a995719