Fix build breakage from CM

Something they did on Oct 28th caused the build
to fail miserably for me.  Still not sure what
it was exactly.

Change-Id: I201d09f8b6e07bc9cca1b95cb30f1ab2fd69bf87