Merge "Update shell documentation for the current state of master."
am: f2233fd67a

Change-Id: I7f31ef326c9e7eee754fda167925de0ea69d9c36