am 8240587f: am 2042cc40: Merge "Update IP and IP2" into jb-mr2-dev

* commit '8240587f7d7e561efbf905ceff8ec929cd6de500':
  Update IP and IP2