Merge "Merge "Only allow roots tasks to be organized" into rvc-dev am: 80849883 am: 086220ab" into rvc-d1-dev-plus-aosp