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

Change-Id: I1f9af93cdff6d54b9906477a691d9a6eef300321