am ece7581e: (-s ours) am 979eccd9: Merge "Sync IP JB sources with mr2."

* commit 'ece7581e93279d1c7653946dd2b45067e459346e':
  Sync IP JB sources with mr2.