DO NOT MERGE Fix "3 dot" icon size so it displays fully am: fa190d437b
am: 6583bc3479  -s ours

Change-Id: I3f2e6b5aa6d3d86f2cc11fadff1f2d25c29b3612