Snap for 8554636 from 85a92221551fdfcb6f935e6effb55002e8793a79 to sdk-release

Change-Id: Ie4c5c51f371cd3ef6e90ef7609f8980fc397344f