am c7611429: am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev

* commit 'c7611429e906423c5f7ba9da80e40bb364c684b1':
  Use plain user icon in UserSpinnerAdapter