Merge "Merge "Minor clean-up in NetworkCapabilities" am: 539f85a1 am: b1e2bfe4 am: 8a956a51" into pi-dev