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

Change-Id: Ia6c2a1b6c61ffd2530f950afd15b5d8314a38ffc