Snap for 4499105 from 28f8980db6acaa90d6319acbb080cf6049882052 to sdk-release

Change-Id: Ice40c4627dc5f03f575de45670067e13e793df5c