Merge "Create USCC ERI file"
am: 31b5a3edf9

Change-Id: I63e7ed1e96cdb63ab9b53530b89532f252892ae7