Merge "docs: Revised Espresso code snippets" into nyc-dev am: aa78ed5b0a am: 884c243e5c
am: 8999d5d8ce

Change-Id: I252b8057db1c84039690d31b03bfa933175f6533