am daec5943: Fix build
automerge: aaf2e19

* commit 'aaf2e190d363f5934e5bc2fd3293d41aa9ac00aa':
  Fix build