Merge "docs: fix broken links in Activity reference" into nyc-dev
am: d428a012ba

Change-Id: Ia79921169d3bf62b0994d663d763f70cda29fe22