Change-Id: I48ddd65125f25ac9f2d03bd43e7ab0a0bcf18196
We will add addressing by IMSI but right now let's focus on the minimum of what needs to be there.