Snap for 6686656 from 51eb94f1616fdaa520d8b15c005de486f46477e3 to sdk-release

Change-Id: Ie3b6dff59608ec6da616ac9f195174899ad094de