Merge "Merge "Fixed the paddings in inbox style to match the rest of the...
Merge "Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev am: 14d8be72 am: 83281ad1" into nyc-mr1-dev-plus-aosp
am: 6677623c
* commit '6677623c':
Change-Id: Iedc481834bf082d5a3e00c9f761c76809373ead3