Merge commit 'e58c0697b52d7ba80df60a2fb24d21915e6cf0b8' of sso://googleplex-android/platform/packages/apps/Contacts into HEAD
Change-Id: Id9ac73727d7bd896fecf22c7da1ffcdef5f6cfb5