Build fix again

Change-Id: Ia3ddea84b022a34709b6be14afb105bedeef0553