Snap for 10447354 from 34e7e11ec02e65d0dd78bfe89c5de2c769a5be2b to mainline-networking-release Change-Id: I1c58a2ff32f9a5a56c08983274947e84aab0d7f3