Merge "Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR" am: ec76007698 am: 536c3a8521 am: 5f17e37be4

Change-Id: I89c0ec94fd04d379f1cccf6425440b8dfbfb753d