Snap for 4499105 from 9d31c1720e1a72553618a1a170d1becca8357208 to sdk-release

Change-Id: I41a897d12add1d77d9ecf871290e80184daccea8