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

* commit '5132d62600484bb4fce86295b288c782bee91de8':
  Update the content shell command's usage instructions.