am cdf79221: am 0dade956: am 364877fb: am 76d7b933: am 7d33575a: Merge "New generic avatar. b/17476433" into ub-gmail-ur14-dev

* commit 'cdf7922122a3a6832a8755ff787ce4605a0b8e29':
  New generic avatar. b/17476433