Fix build, conflict with another change.

Change-Id: If4d7b6c814d946806838cee7dcaccba4c65c3d0f
1 file changed