am d17c8977: am 0b6a436f: Merge "Fix build"

* commit 'd17c89776e71f61852ac6ec3a75859a832cf1ba6':
  Fix build