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

Change-Id: I4d30c3ad9f1d2d9d949e5f1ebc680f65c6925b99