Snap for 5660618 from 09e9b71758936129088ef94cc6928b47c8afa19d to nougat-mr1-cts-release

Change-Id: Ie3e77bbed92a11cc588f6c24ea51567a36bd64b2