Merge "Restrict VVM number settings to portrait" am: 8b1f42f405
am: 5710a03851

Change-Id: I17959b883e71f2c8783e58cfb973d4de7a0cfa2e