Merge "Fix vertical nav button direction issue" into nyc-mr2-dev am: 33db4b77d5
am: 0443d508d1  -s ours

Change-Id: I16aab482468ddc8af33fb4b8ef8f93661c55d43c