Merge "Create USCC ERI file" am: 31b5a3edf9 am: 764ce2a195
am: b7306d9e18

Change-Id: I42a3293934250e15e02c320d3fc24a0b1b3d5d93