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