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

Change-Id: I88ccce93bb353b33438d741916417482416b6030