resolve build error when merging 0f7f7e21
am: 97ea844aca

Change-Id: I9c7eaa3b9e25be3b36e74b71003a1911c14a305b