Merge "Refactor IccRecords and IccCard" into honeycomb-LTE