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

Change-Id: If9670142b17333202be9dc08376b61315fe10eec