Snap for 4649231 from f03effb5a034c9e6dadd27d58fcc2d33af75eb00 to nougat-mr1-cts-release

Change-Id: Ib08936a7f2b82eb7b720105ef6d287ea9fb25f73