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

Change-Id: I70cf4dc9efcf097450fa63bd75cb531019943d76