Merge "Added annotations for injected accessibility objects" into jb-mr1-dev