Snap for 4499105 from bf0dafede3fafd5bf28c631489cd15fd222c139d to sdk-release

Change-Id: I0e16c51290a60edc1e31d3bebede76f382845bed