Fix build after merge.

Change-Id: Iccb1c5a12d453d70eea7e1e3d64d97bc75987bef
3 files changed