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

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