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

* commit '2d323477dc88ef1ba443d0f220c0d614d701ac77':
  Sync changes between IP and IP_JB.