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

Change-Id: Id241939f950517df7b09171913c958cdc6360a3b