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

Change-Id: Ibf8b198689a1f39f7c8d8ca7818382a81dfebcee