am 21bcc03c: am a861b9ab: Build fix #2

* commit '21bcc03c159ab74a95be93e7e10b7704e22de687':
  Build fix #2