Merge "Snap for 4398870 from 5f802b2f84887acb6047c48cd471eb1f85f00c22 to nougat-mr1-cts-release" into nougat-mr1-cts-release