Merge changes from topic 'art_run_test_910_cts' am: e008fd53bf
am: ef7a3b41e4

Change-Id: Ied27d9aa719d693554e1c66fba7ae70437c7996a