am bab316fe: am e79af7df: Merge "Fix build."

* commit 'bab316fea269369194d3126a5d79409c9192580f':
  Fix build.