Merge "Add function to encode PLMNs" am: f681744863 am: 3e8650c5d1
am: b4df52a9c1

Change-Id: I871e0f517c9fa52a6d9f742c9c82bafb191e8c53