Fix build issue in mainline

Change-Id: If62ea3f0c554da7e6d52f7d4f0f23f5a6de7214e