Merge "Merge "Fix "already registered" error" am: 0df5bbfe90 am: c4b00b8f57 am: f5bc120ad5" into sc-v2-dev-plus-aosp