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

Change-Id: I751176d2cdea53a7e4e27249a1309ec5fed7bc76