Merge "Remove the hard-coded counterId in VaultParams" into pi-dev
am: 88956ce326

Change-Id: I9112e639ae556de60cc2da64eef283033e99cca6