Merge "Fix @link tags in keystore doc" into nyc-docs am: 3188f77658 am: 7218af3f9a
am: 58635e74ed

Change-Id: Ie3ba00057e4b44c41520af58fd27dfbbb412f3ca