am 9f4a3a9d: am 2d323477: Merge "Sync changes between IP and IP_JB."

* commit '9f4a3a9d942905ea3bef73477032a7ac40b8fffc':
  Sync changes between IP and IP_JB.