Snap for 5590969 from c85ea3023a893334f1ce33251cfb0f1f3dd2c1ed to sdk-release

Change-Id: Iaf44b2ffb4ba096af7ac2aa6729f28d21b10bec2