Merge "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev am: 68311f8712
am: 4b35637a4a

Change-Id: If37d42fffcd17cec5e00f92c8a24215cc5425751