Merge "Snap for 4782231 from 634f178e4cf29614bfeff6641ac92bf714b117da to nougat-cts-release" into nougat-cts-release