am 934d8d85: am daec5943: Fix build automerge: aaf2e19

* commit '934d8d85be221b86cb5097625c0f48391b3a71b2':
  Fix build