Snap for 4444158 from 8c15f7efd1e85ac70c64ffc103eb87362334d48a to oreo-cts-release

Change-Id: Id046211ebdff3ffc12d6e20d55b8f8ebaf08ff49