am 694f9ff4: am e3982a86: Merge "Update IP_JB to Mr1" into jb-mr2-dev

* commit '694f9ff404f1ae4a48e0edd02a5953550630b086':
  Update IP_JB to Mr1