Merge "Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR"
am: 6527de11d5

Change-Id: I20fca85b3541e2d877aa5b0638aa8609701b5249