Merge "Merge "Fix "already registered" error" am: 0df5bbfe am: c4b00b8f am: f5bc120a" into sc-v2-dev-plus-aosp