fix build error after last merge

Change-Id: I67d6c553bf4850aa175afd7ac86175bc52113e98