Forgot to update with last CL. (cherry picked from commit c60bdf66) Change-Id: I41ad168a5906ca07938bdd212a55f0e995ee5df7