Merge "Snap for 4604451 from 485c16b4d32168d7efa29dbc3b9d4828d46d8dfe to nougat-mr1-cts-release" into nougat-mr1-cts-release