Merge "Use Uppercase instead of Lowercase for PLMN Decode" into pi-dev
am: 2125e5c59e

Change-Id: I850e3f98c9ce4b9221665552b50055bc31f72a04