Fix build breakage.

Change-Id: If519f1730266f10a7852af209127aa4754a7ef9d
8 files changed