Merge "Snap for 4794321 from 6dc384b585f4867d4f5c7a3c16a009aada48dd8c to nougat-cts-release" into nougat-cts-release