am 979eccd9: Merge "Sync IP JB sources with mr2."

* commit '979eccd9053700f64d6e6baa93dcb32ae65f16d6':
  Sync IP JB sources with mr2.