Merge commit '7a1140ee899a9fef550e7a573e44c2d1bd9ad721' * commit '7a1140ee899a9fef550e7a573e44c2d1bd9ad721': Fix http://b/issue?id=2096107 (cosmetic issue for menus in WVGA)
Merge commit '7a1140ee899a9fef550e7a573e44c2d1bd9ad721' * commit '7a1140ee899a9fef550e7a573e44c2d1bd9ad721': Fix http://b/issue?id=2096107 (cosmetic issue for menus in WVGA)