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

* commit '0dade956450bb08b5c02507886c632d3e32fbe6f':
  New generic avatar. b/17476433