Merge "Merge "IpManager: delete dead getLinkProperties() code" into nyc-dev am: e24708e am: 777a66e" into nyc-mr1-dev-plus-aosp