am 0114c401: am 9486b751: am 6cef32da: am a4b5463d: am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev

* commit '0114c4017fcf22852d1a03dd50496f8bfae53790':
  Revert "Clean-up Email Icons"