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