Build fix from Merge

Change-Id: I178b12bb904bd1ad7f426634e396aea8685cd73d