Merge "hammerhead: Disable "import contacts from SIM" feature for sprint" into klp-dev