Added missing highlights; removed links in default description.

Change-Id: I51b9676e1764740cd2ba44f8485e8a9ac44992ee