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

* commit '7bb1a27f7306c4be9d6200a310db36819712899e':