Merge "Merge "Fix crashes in UserDetailViewAdapterTest." into rvc-dev am: 73a4bfc9f8 am: 1086de18d6 am: 1622dee606" into rvc-qpr-dev-plus-aosp