Merge changes from topic "msisdn" am: 06a2db194f

Change-Id: Ic88fbfa867a105b5c687fe9481b16910eb08a226