Merge "Emergency dialer grid" into oc-dr1-dev
am: 2bf2346e64

Change-Id: I096881d4c6f552cb67a0ce71ea59d4b698767d91