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

Change-Id: I43787a43ea79d506ece2358a00fb952688fe34e6