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

Change-Id: I18362b25771b180791f0716b329662c11d1eb863