Merge changes from topic 'art_run_test_912_cts_refactor'
am: afcec28403

Change-Id: Ibda516ad39de9a931e3b4ddc3ecfbeaba01dc719