am a4629b0b: Merge "JB MR2 == API 18." into jb-mr2-dev

* commit 'a4629b0b833f78481ca51baa44b0303ebe647a7c':
  JB MR2 == API 18.