Merge "Fix a bad comment. - DO NOT MERGE" into jb-dev-plus-aosp