Merge "Merge "Fix ITS Manual Test validate scene issue" into nougat-cts-dev am: 633ab068cd" into nougat-mr1-cts-dev
am: bb8fca3514

Change-Id: Ibb8c778cd5ddd28d6bf84e32d1d15a04184e35c3