Merge "Snap for 4402654 from 825fe974b2130eba812213e1196f3cdeb6e8e180 to nougat-cts-release" into nougat-cts-release