Merge "request{LinkProperties,NetworkCapabilities} no longer needed" am: 75dfc5bd91
am: 0f901af920

Change-Id: I891abf2a1a4138b9d80b8544ac6d09deda8d3d62