Merge "Update shell and utilities docs for O." am: 1ca9852366
am: 80c5a9bb77

Change-Id: I5126dfd3de3c636f67eb003d47b6fc7b5021a8c9