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

Change-Id: I45abd057187ba4c74b1c6d0a7e19ea725b581846