Merge changes from topic "fix-telephony-registry-location"
am: 7021ee581a

Change-Id: If5684f052d367d082fa61bb6e0be90657d9be180