Merge "Separate work and personal contacts search result am: 9045160771 am: 47037f9fef" into nyc-mr1-dev-plus-aosp