Fix build.

Change-Id: Icdbf7811e7acb8bed372def3beec8385a631713a
Merge "Fix build."