Merge "Regenerate counterId when a new cert XML file is successfully imported" into pi-dev
am: 8f4fae9d84

Change-Id: I5e4cf1cd5320815b8eab40178703e674a87640c5