Fix some does not exist errors

 * Surfaced in bug 63613.

Change-Id: I691c171c1e3290e06bdeaa32abc818560ba2b135
Merge "Fix some does not exist errors"