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

Change-Id: I1c42b42a0a1360ee33a9b1a604c7263ded0236e2