Snap for 8554636 from 331b20e54ddde93785d7688ebb0cdc1cbcf9fd9b to sdk-release

Change-Id: I5e15ea1ac48e8563bc5f9a86abf5da679264dae2