DO NOT MERGE: quick hack to let build succeed

Change-Id: I3d97bc08348d4a43797a5d3bc0fbf4a0e8d64742