resolve build error when merging 0f7f7e21 am: 97ea844aca
am: 977adba098

Change-Id: I30673c8b014a5da69291c4b42894e3cd560ed42f