Merge "DOC CHANGE: AOSP33968 Typo" into jb-dev