am 17f9e778: (-s ours) am 5132d626: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge

* commit '17f9e778a5f22bce8df9bed83b9b0d7abf72e9a9':
  Update the content shell command's usage instructions.