Merge "Merge "Fix crashes in UserDetailViewAdapterTest." into rvc-dev am: 73a4bfc9 am: 1086de18 am: 1622dee6" into rvc-qpr-dev-plus-aosp