Merge branch 'merge-login_manager-rewrite' into merge-login_manager

BUG=chromium:330883

Change-Id: Ieaa53b7ebf96cd694b5b76c9750b440cd2384a43
tree: 0bc2dfbfaafb537a26c7f19284291bbf574ceaa1
  1. buffet/