Commits

Craig Mautner authored dd221b37808
Fix oversight when checking in last CL Too much was deleted due to the order of operations while debugging. CL 435015 removed some critical lines. Fixes bug 13410184. Change-Id: Ia1fbf985d73163742c4c531e8505606454897f69