Merge "Strip +1 when subscribing to VVM3" am: ed5b76a12e am: 26c925693e
am: 6d37f466d1

Change-Id: Ib3bf8afa2b0baa5a04a4e1ac4fc7eeab4727266f