Revert of Creates a BattOrConnection for communicating with the BattOr

Revert of Creates a BattOrConnection for communicating with the BattOr (patchset #6 id:120001 of https://codereview.chromium.org/1524873002/ )

Reason for revert:
Build failures on windows? Not sure why this made it through the CQ then. Please follow up with a bug @ infra team when that is sorted out. https://build.chromium.org/p/chromium/builders/Win/builds/38410/steps/compile/logs/stdio

FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\tools\battor_agent\battor_agent_lib.battor_agent.obj.rsp /c ..\..\tools\battor_agent\battor_agent.cc /Foobj\tools\battor_agent\battor_agent_lib.battor_agent.obj /Fdobj\tools\battor_agent\battor_agent_lib.cc.pdb
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) : error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) : error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) : error C2371: 'battor::__attribute__' : redefinition; different basic types
        c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) : see declaration of 'battor::__attribute__'
FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\tools\battor_agent\battor_agent_lib.battor_connection.obj.rsp /c ..\..\tools\battor_agent\battor_connection.cc /Foobj\tools\battor_agent\battor_agent_lib.battor_connection.obj /Fdobj\tools\battor_agent\battor_agent_lib.cc.pdb
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) : error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) : error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) : error C2371: 'battor::__attribute__' : redefinition; different basic types
        c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) : see declaration of 'battor::__attribute__'
FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\tools\battor_agent\battor_agent.battor_agent_bin.obj.rsp /c ..\..\tools\battor_agent\battor_agent_bin.cc /Foobj\tools\battor_agent\battor_agent.battor_agent_bin.obj /Fdobj\tools\battor_agent\battor_agent.cc.pdb
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) : error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) : error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) : error C2371: 'battor::__attribute__' : redefinition; different basic types
        c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) : see declaration of 'battor::__attribute__'
ninja: build stopped: subcommand failed.

Original issue's description:
> Creates a BattOrConnection for communicating with the BattOr
>
> I first tried to implement the protocol with this logic rolled into
> BattOrAgent. However, BattOrAgent needs to act as a state machine
> stepping through the BattOr protocol and, as the state machine grew,
> it became obvious that we should move as much unrelated logic as
> possible out of the class. The byte-level protocol now seen in
> battor_connection.cc was an obvious choice to be moved elsewhere.
>
> For a look at how these communication primitives will be used to
> implement the protocol, see http://bit.ly/1UpLv3p.
>
> BUG=542837
>
> Committed: https://crrev.com/07027e6fbaa31604a908f7d1d2b42e789e93add8
> Cr-Commit-Position: refs/heads/master@{#365606}

TBR=zhenw@chromium.org,nednguyen@google.com,primiano@chromium.org,mmenke@chromium.org,charliea@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=542837
Committed: https://crrev.com/731a1238920ae9b7216cd2ced12267deb0d63e19
Cr-Commit-Position: refs/heads/master@{#365622}

[danakj, 2015-12-16 21:23:09]

Created Revert of Creates a BattOrConnection for communicating with the BattOr

[commit-bot: I haz the power, 2015-12-16 21:24:37]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1533643002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1533643002/1

[commit-bot: I haz the power, 2015-12-16 21:26:03]

Description was changed from

==========
Revert of Creates a BattOrConnection for communicating with the BattOr (patchset
#6 id:120001 of https://codereview.chromium.org/1524873002/ )

Reason for revert:
Build failures on windows? Not sure why this made it through the CQ then. Please
follow up with a bug @ infra team when that is sorted out.
https://build.chromium.org/p/chromium/builders/Win/builds/38410/steps/compile...

FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc
"C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo
/showIncludes /FC @obj\tools\battor_agent\battor_agent_lib.battor_agent.obj.rsp
/c ..\..\tools\battor_agent\battor_agent.cc
/Foobj\tools\battor_agent\battor_agent_lib.battor_agent.obj
/Fdobj\tools\battor_agent\battor_agent_lib.cc.pdb 
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2371: 'battor::__attribute__' : redefinition; different basic types
       
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
see declaration of 'battor::__attribute__'
FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc
"C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo
/showIncludes /FC
@obj\tools\battor_agent\battor_agent_lib.battor_connection.obj.rsp /c
..\..\tools\battor_agent\battor_connection.cc
/Foobj\tools\battor_agent\battor_agent_lib.battor_connection.obj
/Fdobj\tools\battor_agent\battor_agent_lib.cc.pdb 
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2371: 'battor::__attribute__' : redefinition; different basic types
       
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
see declaration of 'battor::__attribute__'
FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc
"C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo
/showIncludes /FC @obj\tools\battor_agent\battor_agent.battor_agent_bin.obj.rsp
/c ..\..\tools\battor_agent\battor_agent_bin.cc
/Foobj\tools\battor_agent\battor_agent.battor_agent_bin.obj
/Fdobj\tools\battor_agent\battor_agent.cc.pdb 
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2371: 'battor::__attribute__' : redefinition; different basic types
       
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
see declaration of 'battor::__attribute__'
ninja: build stopped: subcommand failed.

Original issue's description:
> Creates a BattOrConnection for communicating with the BattOr
> 
> I first tried to implement the protocol with this logic rolled into
> BattOrAgent. However, BattOrAgent needs to act as a state machine
> stepping through the BattOr protocol and, as the state machine grew,
> it became obvious that we should move as much unrelated logic as
> possible out of the class. The byte-level protocol now seen in
> battor_connection.cc was an obvious choice to be moved elsewhere.
> 
> For a look at how these communication primitives will be used to
> implement the protocol, see http://bit.ly/1UpLv3p.
> 
> BUG=542837
> 
> Committed: https://crrev.com/07027e6fbaa31604a908f7d1d2b42e789e93add8
> Cr-Commit-Position: refs/heads/master@{#365606}

TBR=zhenw@chromium.org,nednguyen@google.com,primiano@chromium.org,mmenke@chro...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=542837
==========

to

==========
Revert of Creates a BattOrConnection for communicating with the BattOr (patchset
#6 id:120001 of https://codereview.chromium.org/1524873002/ )

Reason for revert:
Build failures on windows? Not sure why this made it through the CQ then. Please
follow up with a bug @ infra team when that is sorted out.
https://build.chromium.org/p/chromium/builders/Win/builds/38410/steps/compile...

FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc
"C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo
/showIncludes /FC @obj\tools\battor_agent\battor_agent_lib.battor_agent.obj.rsp
/c ..\..\tools\battor_agent\battor_agent.cc
/Foobj\tools\battor_agent\battor_agent_lib.battor_agent.obj
/Fdobj\tools\battor_agent\battor_agent_lib.cc.pdb 
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2371: 'battor::__attribute__' : redefinition; different basic types
       
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
see declaration of 'battor::__attribute__'
FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc
"C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo
/showIncludes /FC
@obj\tools\battor_agent\battor_agent_lib.battor_connection.obj.rsp /c
..\..\tools\battor_agent\battor_connection.cc
/Foobj\tools\battor_agent\battor_agent_lib.battor_connection.obj
/Fdobj\tools\battor_agent\battor_agent_lib.cc.pdb 
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2371: 'battor::__attribute__' : redefinition; different basic types
       
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
see declaration of 'battor::__attribute__'
FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc
"C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo
/showIncludes /FC @obj\tools\battor_agent\battor_agent.battor_agent_bin.obj.rsp
/c ..\..\tools\battor_agent\battor_agent_bin.cc
/Foobj\tools\battor_agent\battor_agent.battor_agent_bin.obj
/Fdobj\tools\battor_agent\battor_agent.cc.pdb 
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2371: 'battor::__attribute__' : redefinition; different basic types
       
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
see declaration of 'battor::__attribute__'
ninja: build stopped: subcommand failed.

Original issue's description:
> Creates a BattOrConnection for communicating with the BattOr
> 
> I first tried to implement the protocol with this logic rolled into
> BattOrAgent. However, BattOrAgent needs to act as a state machine
> stepping through the BattOr protocol and, as the state machine grew,
> it became obvious that we should move as much unrelated logic as
> possible out of the class. The byte-level protocol now seen in
> battor_connection.cc was an obvious choice to be moved elsewhere.
> 
> For a look at how these communication primitives will be used to
> implement the protocol, see http://bit.ly/1UpLv3p.
> 
> BUG=542837
> 
> Committed: https://crrev.com/07027e6fbaa31604a908f7d1d2b42e789e93add8
> Cr-Commit-Position: refs/heads/master@{#365606}

TBR=zhenw@chromium.org,nednguyen@google.com,primiano@chromium.org,mmenke@chro...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=542837
==========

[commit-bot: I haz the power, 2015-12-16 21:26:04]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2015-12-16 21:27:04]

Description was changed from

==========
Revert of Creates a BattOrConnection for communicating with the BattOr (patchset
#6 id:120001 of https://codereview.chromium.org/1524873002/ )

Reason for revert:
Build failures on windows? Not sure why this made it through the CQ then. Please
follow up with a bug @ infra team when that is sorted out.
https://build.chromium.org/p/chromium/builders/Win/builds/38410/steps/compile...

FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc
"C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo
/showIncludes /FC @obj\tools\battor_agent\battor_agent_lib.battor_agent.obj.rsp
/c ..\..\tools\battor_agent\battor_agent.cc
/Foobj\tools\battor_agent\battor_agent_lib.battor_agent.obj
/Fdobj\tools\battor_agent\battor_agent_lib.cc.pdb 
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2371: 'battor::__attribute__' : redefinition; different basic types
       
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
see declaration of 'battor::__attribute__'
FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc
"C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo
/showIncludes /FC
@obj\tools\battor_agent\battor_agent_lib.battor_connection.obj.rsp /c
..\..\tools\battor_agent\battor_connection.cc
/Foobj\tools\battor_agent\battor_agent_lib.battor_connection.obj
/Fdobj\tools\battor_agent\battor_agent_lib.cc.pdb 
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2371: 'battor::__attribute__' : redefinition; different basic types
       
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
see declaration of 'battor::__attribute__'
FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc
"C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo
/showIncludes /FC @obj\tools\battor_agent\battor_agent.battor_agent_bin.obj.rsp
/c ..\..\tools\battor_agent\battor_agent_bin.cc
/Foobj\tools\battor_agent\battor_agent.battor_agent_bin.obj
/Fdobj\tools\battor_agent\battor_agent.cc.pdb 
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2371: 'battor::__attribute__' : redefinition; different basic types
       
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
see declaration of 'battor::__attribute__'
ninja: build stopped: subcommand failed.

Original issue's description:
> Creates a BattOrConnection for communicating with the BattOr
> 
> I first tried to implement the protocol with this logic rolled into
> BattOrAgent. However, BattOrAgent needs to act as a state machine
> stepping through the BattOr protocol and, as the state machine grew,
> it became obvious that we should move as much unrelated logic as
> possible out of the class. The byte-level protocol now seen in
> battor_connection.cc was an obvious choice to be moved elsewhere.
> 
> For a look at how these communication primitives will be used to
> implement the protocol, see http://bit.ly/1UpLv3p.
> 
> BUG=542837
> 
> Committed: https://crrev.com/07027e6fbaa31604a908f7d1d2b42e789e93add8
> Cr-Commit-Position: refs/heads/master@{#365606}

TBR=zhenw@chromium.org,nednguyen@google.com,primiano@chromium.org,mmenke@chro...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=542837
==========

to

==========
Revert of Creates a BattOrConnection for communicating with the BattOr (patchset
#6 id:120001 of https://codereview.chromium.org/1524873002/ )

Reason for revert:
Build failures on windows? Not sure why this made it through the CQ then. Please
follow up with a bug @ infra team when that is sorted out.
https://build.chromium.org/p/chromium/builders/Win/builds/38410/steps/compile...

FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc
"C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo
/showIncludes /FC @obj\tools\battor_agent\battor_agent_lib.battor_agent.obj.rsp
/c ..\..\tools\battor_agent\battor_agent.cc
/Foobj\tools\battor_agent\battor_agent_lib.battor_agent.obj
/Fdobj\tools\battor_agent\battor_agent_lib.cc.pdb
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2371: 'battor::__attribute__' : redefinition; different basic types
       
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
see declaration of 'battor::__attribute__'
FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc
"C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo
/showIncludes /FC
@obj\tools\battor_agent\battor_agent_lib.battor_connection.obj.rsp /c
..\..\tools\battor_agent\battor_connection.cc
/Foobj\tools\battor_agent\battor_agent_lib.battor_connection.obj
/Fdobj\tools\battor_agent\battor_agent_lib.cc.pdb
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2371: 'battor::__attribute__' : redefinition; different basic types
       
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
see declaration of 'battor::__attribute__'
FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc
"C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo
/showIncludes /FC @obj\tools\battor_agent\battor_agent.battor_agent_bin.obj.rsp
/c ..\..\tools\battor_agent\battor_agent_bin.cc
/Foobj\tools\battor_agent\battor_agent.battor_agent_bin.obj
/Fdobj\tools\battor_agent\battor_agent.cc.pdb
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2065: 'packed' : undeclared identifier
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(73) :
error C2371: 'battor::__attribute__' : redefinition; different basic types
       
c:\b\build\slave\win\build\src\tools\battor_agent\battor_protocol_types.h(67) :
see declaration of 'battor::__attribute__'
ninja: build stopped: subcommand failed.

Original issue's description:
> Creates a BattOrConnection for communicating with the BattOr
>
> I first tried to implement the protocol with this logic rolled into
> BattOrAgent. However, BattOrAgent needs to act as a state machine
> stepping through the BattOr protocol and, as the state machine grew,
> it became obvious that we should move as much unrelated logic as
> possible out of the class. The byte-level protocol now seen in
> battor_connection.cc was an obvious choice to be moved elsewhere.
>
> For a look at how these communication primitives will be used to
> implement the protocol, see http://bit.ly/1UpLv3p.
>
> BUG=542837
>
> Committed: https://crrev.com/07027e6fbaa31604a908f7d1d2b42e789e93add8
> Cr-Commit-Position: refs/heads/master@{#365606}

TBR=zhenw@chromium.org,nednguyen@google.com,primiano@chromium.org,mmenke@chro...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=542837

Committed: https://crrev.com/731a1238920ae9b7216cd2ced12267deb0d63e19
Cr-Commit-Position: refs/heads/master@{#365622}
==========

[commit-bot: I haz the power, 2015-12-16 21:27:05]

Patchset 1 (id:??) landed as
https://crrev.com/731a1238920ae9b7216cd2ced12267deb0d63e19
Cr-Commit-Position: refs/heads/master@{#365622}