Merge "Merge "Merge "Fix turning off duing parallel testing and multiple ITS activities" into nougat-cts-dev am: 8618bdab0e" into nougat-mr1-cts-dev am: ac29576147" into nyc-mr1-dev am: 7f3735410c
am: bf581ba7d9

Change-Id: If824e957c642027813f64891dc72c4585e2aa5a0