Snap for 10447354 from 07cccd56b507bb63faad951c5f9f31e0ca46f788 to mainline-networking-release

Change-Id: I9b633d264e14505645f84df19386f85778d0fffa