Merge "Make sure to unregister PhoneChangeReceiver." into oc-mr1-dev
am: 921acf9ad5

Change-Id: I8b0f38b983a6b63a3682358daf98110313527a5c