Big yikes. Closes #1878 Change-Id: Id2d2a337a145b8fbf2a515154bf009a085300904 (cherry picked from commit b805252b94)
b805252b94