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

Change-Id: I2d6776ecbf524f6abfb2636697ac7847ebe1e85d