am 825c2655: am 6ca1dbd4: am 6baab44e: Merge "Fix build"

* commit '825c2655b7bbd5f88d316a5a9b3a746c50282c24':
  Fix build