Snap for 4402654 from 825fe974b2130eba812213e1196f3cdeb6e8e180 to nougat-cts-release

Change-Id: Idec8d034e65bb12fad2c0f247b8e6381810e2874