Snap for 8554636 from 0ba865af92b306705feea4a6d6f6b02c82902ad1 to sdk-release

Change-Id: Id1020bb6c183439a8650bccfffd112f7b3f090bd