Merge branch 'merge-login_manager-rewrite' into merge-login_manager BUG=chromium:330883 Change-Id: Ieaa53b7ebf96cd694b5b76c9750b440cd2384a43