Sync IP JB sources with mr2.

Change-Id: If7309d688e47f61e32fa7f4e253877424532ec56
21 files changed