Merge "Fixes lint errors for a menu item." into nyc-dev am: a1e76c85 am: 4110eddc am: 94b5c0a8 am: fbddd6d3 Change-Id: Iee216887c23957afe6d36af18d49c5088120e38b