am 49c2756b: am b3ec0639: am 7e1a45d8: Merge "Fix accessibility API injection." into jb-mr1-dev

* commit '49c2756b1c4996e9ebcc70c89095f436790b5469':
  Fix accessibility API injection.