Merge "Merge "Merge "Revert "Clean up previous DA organizer when registering"" into sc-dev am: 37ae9cfc am: c817fba8" into sc-v2-dev-plus-aosp am: 49c522cd"