am e926ff70: Merge "Fix build break."

* commit 'e926ff70839ae10e78525a021a0c79c9d080cb35':
  Fix build break.