am 8de6d690: Fix build break DO NOT MERGE

* commit '8de6d690ae5843bd8e005deedea571596f79bbd3':
  Fix build break DO NOT MERGE