am: 2a3ca731 -s ours * commit '2a3ca731': DO NOT MERGE: Move PinningNetworkCallback out to a new NetworkPinner class.