am e4ddc394: am 59b2923c: am 7d1b833e: fixing build

Merge commit 'e4ddc394fa6285f0ebe629c51d634d1403f4d1bf'

* commit 'e4ddc394fa6285f0ebe629c51d634d1403f4d1bf':
  fixing build