Snap for 8564071 from 8466ade7f9fce92bb1ef8c6fd3dc01968bdf68b9 to mainline-tethering-release

Change-Id: I926165e89c6af89179e2c609de6295778dbee686