Merge "Clean up unused declaration getNetworkForUserLocked"