Merge "docs: Revised Espresso code snippets" into nyc-dev
am: aa78ed5b0a

Change-Id: I6609dc0031bd2e8f1c4d656f2c4a55c161e96071