Merge "Update task orgs with existing tasks" into rvc-dev am: 5cb5fed8b5 am: 5b0316b90c

Change-Id: I23a61e9bc1bb101b676d42e0de73cb716e9a2fa0