Merge "Device show "No SIM card" and then showing carrier name during boot" into pi-dev
am: 2f97046a4e

Change-Id: I3f3f5d49b390dd7841ade7e33fd2ddc5e5309aa1