Snap for 4499105 from 4e8243ffe9cda940112cde32017a90a9e1bc6878 to sdk-release

Change-Id: I5a37fd456d5b759018f846ee362a01277dbc49ce