Merge "Deprecate getActiveLinkProperties." am: 4b7cae6c0d
am: 19159dbc95

Change-Id: Iab302f94c8b33373831e1aa2aa4ff2beac9cf82f