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

Change-Id: Ia708a585683177252dfe64b4239e5fd1173dabf9