Merge "Snap for 4485146 from 8b63daf200cc2734ddf025dc6ffc86f6190ed821 to nougat-cts-release" into nougat-cts-release