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

Change-Id: I1d52c6165aec1ccbbe3551b63470bd3822f69d77