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

* commit '9b8133966ac16c11033200edf0a1c717a2bfcb9e':
  Fix build >= JB