am 63b007e6: Fixing build breakage

* commit '63b007e651f7b487b09f42f13fe03e0327edea6f':
  Fixing build breakage