am 4d49f477: Merge "Fix build >= JB"

* commit '4d49f477fcf14f82f6c588dd7afc5b5c3beaea18':
  Fix build >= JB