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

Change-Id: I6af0faa8a2a6b87e874a1713ae0388ee6ba9408c