am d69ec35b: am 1aa6708c: Fix the build. Oops.

Merge commit 'd69ec35bef0d3aa11bfb55501951eed8c3042fda'

* commit 'd69ec35bef0d3aa11bfb55501951eed8c3042fda':
  Fix the build. Oops.