Merge "Merge "docs: fix link in Loader reference page" into nyc-dev am: 3c638c1ea1 am: 09e4d9bada" into nyc-mr1-dev-plus-aosp