am 5673c13b: am aacd80fd: Fix build break.

* commit '5673c13b51bc4719d9a1afceb1aeb4743e86e230':
  Fix build break.