Fix build error after last merge

Change-Id: Icb093e946cc408c2377f10f6931c145026e043a6