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