Merge "Add missing } on @link tag." am: 31b0c6fb32 am: 80bfc216ca
am: 847acf2b9a

Change-Id: I012fa6fdd42edd4f9ee912ea990700ba3c60f2f0