Merge "Snap for 4564815 from f2db306ba223cb5b9c9f6bde6f2fca2d03402968 to nougat-mr1-cts-release" into nougat-mr1-cts-release