Snap for 4782236 from 30ef1bf331d251fce77e0a7a9a5c3ea9c638d32f to nougat-mr1-cts-release

Change-Id: I8f282e2180a65552315765aeb8762c67edd5c8f7