Merge "Revert submission 1191937-art_apex_available"
am: a857615390

Change-Id: I481c6130f8be893a9551b880f8b1530784b7f6ed