Merge "Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR"