am e5715521: am 2d9f4620: Fix build

* commit 'e5715521232443f01f8c0c0633cac364c8136bde':
  Fix build