Merge "DOC CHANGE: AOSP 33831 - Typo" into jb-dev