Merge \\\"docs: fixed \\\'@\\\' signs that were escaped improperly\\\" into nyc-dev am: a7ce29962c am: 081b4b3265
am: 424e11ffce

Change-Id: I1b6eaa1952615ac5d3c1a280529042f46a35b4a2