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

Change-Id: I86917b1f552202afdef7ad9797da01bbe60110d6