Merge "Read ICCID before broadcasting state LOCKED."
am: 8c05f23c18

Change-Id: I1d21f506bfaa2f28c8f0cad84246cc86eb4c3a52