[automerger skipped] Merge "Fixed the spn from IccRecords" am: 69715225 am: 5ff6f9ae -s ours
am: 7d345dd5 -s ours
am skip reason: change_id I144ca55705273081c00a5abfd7872c8b1cbb9b01 with SHA1 4939e95c is in history
Change-Id: Ib64b51e969f3abe445c678383c1df0625aec45e0