Revert "Revert "Fix build error""

This reverts commit 4768ca0e88a54d61299c7de0eb91d8d9336a3cd4.

Change-Id: I1c7656429b409bc14d16afa9369a8a7ecdbdf55c