am c3aa249f: am 63b007e6: Fixing build breakage

* commit 'c3aa249f3c87250f2c9e203a75771d4b1df43153':
  Fixing build breakage