Merge "Update navup button content description when it's menu." into nyc-mr1-dev
am: bf1d4cae3b

Change-Id: I44c5ebf3d83c707e9e2abb246a70c324d1e32fd4