Merge "Fix accessibility API injection." into jb-mr1-dev