Merge "Only allow roots tasks to be organized" into rvc-dev am: 80849883 am: 702d2fce am: 6ebe1fdf am: e080e86c Change-Id: I9792571401102abf9b38e0600b4c073d1c9cfc3d