Snap for 5611628 from 0084c122645a31a1a45f0005c3dce32d48413866 to sdk-release

Change-Id: Ie68d2f64b227ef0bcc63f313d2b070a556ba5022