am 2d5e1227: am 0060deb6: Merge "Move the account picker class name to a config resource." into jb-mr2-dev

* commit '2d5e1227f61c13b0bdf3c702828763e53f0cd774':
  Move the account picker class name to a config resource.