am 3cd92d8f: (-s ours) Merge "Fix a bad comment. - DO NOT MERGE" into jb-dev-plus-aosp

* commit '3cd92d8faa9fd345d5bfc0d794e28449d4f6c810':
  Fix a bad comment. - DO NOT MERGE