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

Change-Id: I92c2713c904793af0f296ab8f04da69e86b8991d