tree d38978bbe6c6acf8b0068207978719f0b739fd98
parent 5b9d0ba470eaa0eac195dc7cf6e2d4a8cb495074
author Alan Viverette <alanv@google.com> 1520387829 +0000
committer Alan Viverette <alanv@google.com> 1520387829 +0000

Restore OCR+2 following refactor

This reverts commit 5b9d0ba470eaa0eac195dc7cf6e2d4a8cb495074.

Change-Id: I99e677f343750135e73f38f7e1033a010e5b3d3a