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

Change-Id: Ifa6c8b14f79c1e885fb360f22beccace0b27c3f3