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

Change-Id: I8f350a045c1eb301418a91edfd975a388298507b