Snap for 7550844 from 50e98251ff58b2ec45a09840e774cdb67ac75594 to mainline-tethering-release

Change-Id: I4b206ebe7eb88ccf73b27a539d52da6aae1442bd