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

Change-Id: I4d97531e5b6a52d053286e088459c35d6a3d4f7e