Snap for 4539635 from 65e0e6e2254eab162d9d8d4e05f598cefef10c5b to nougat-cts-release

Change-Id: I6f4d03ec8cf985dd2235ed56485eba640aef3daa