Snap for 9550355 from db03f6cf0622c772ac54ed1ca09e1bac7a95f429 to sdk-release

Change-Id: I3dca772d4a14927a9c4476888a9c61277ecbdd7b