Fix the build 16.

Change-Id: I32ba44ac474788cc1f0bb437f94e424b606f7f95