Also fix up styles to (mostly) match mocks and be consistent with Gmail Bug: 5205957 Change-Id: Iea7e9706464a8050255a7be78fca471cb7f9f6cf