Merge "Allow CTS test to control organized tasks" into rvc-dev am: 201af5078f

Change-Id: I379c4fd14c2b3ffb71bed90eab2aa68bc641cc9f