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

Change-Id: Ied462165f9a794a6d213ee93b4876e52d139e200