[automerger skipped] Merge changes from topic "msisdn" am: 06a2db194f am: af1cb0433d -s ours

am skip reason: Change-Id Ie97d0b195937d4729875afd1e74357c1284e101f with SHA-1 48273a3520 is in history

Change-Id: Id9de06a7d58f4335d083ab956d80da210a3d5c60