am f1d2c5ae: Merge "Doc change: diffs for API 18" into jb-mr2-dev

* commit 'f1d2c5aeb23739bde3708f4e4d4bdb99f059f1ed':
  Doc change: diffs for API 18