Snap for 4398159 from e4c6ab333910f74ce7dd969215b80d97c016a952 to nougat-mr1-cts-release

Change-Id: I7a2a31385d5bfc19df72c47bd881d4c98db2b372