Merge "Merge "Fix a shared identity test" into udc-dev am: 1ce7457c36 am: 2ce8360b0d"