Sync changes between IP and IP_JB.

Change-Id: Ib4e1b3d4c2e3b57250f73fd926bb840cbfe60e5b
31 files changed