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

Change-Id: I49963b9f7415dfcb05132c5cb9d8fa4b2231b53f