#rb josh.adams
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: peter.sauerbrei
#ROBOMERGE-SOURCE: CL 5371683 via CL 5371685 via CL 5371686 via CL 5371688 via CL 5375941 via CL 5378530
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)
[CL 5406577 by peter sauerbrei in Dev-Networking branch]