Merge "docs: Revised Espresso code snippets" into nyc-dev am: aa78ed5b am: 884c243e am: 8999d5d8 am: 7106d690 Change-Id: I0123aa8fb25a22fc9f0983d28506e34395c0b0e9