Merge "Strip +1 when subscribing to VVM3"
am: ed5b76a12e

Change-Id: Ifa0542fe81ce75129cd488727e7c55e4852060e9