Merge "Fixes lint errors for a menu item." into nyc-dev
am: a1e76c85b3

Change-Id: I2d6067734f1bf4d3e12483a850339406b07a541d