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

Change-Id: I1c758b3050b98896b2089a70ef87ed784671de95