Merge changes from topic 'art_run_test_910_cts'
am: e008fd53bf

Change-Id: Icdd80aeb36f47eb1b89b2e067f4ae8edbe517954