Merge changes from topic 'art_run_test_912_cts_refactor' am: afcec28403
am: ccaac1364d

Change-Id: I01b0db54a7556a0619b301f8dd8d0c24b823aa57