Snap for 5660618 from 93bc1a35a2b7d6fa2f3a43bebead33001b9a2639 to nougat-mr1-cts-release

Change-Id: I8911d20eadaece96eff2f795f432ed66d5e2eb48