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

Change-Id: I8222d96f03dbde0d325f5e547974161058a8f831