Snap for 8554636 from 6be8108dec5d5b2793798d628024aa7e01a65077 to sdk-release

Change-Id: I7137f4d364877707969f9375d17bd24860436447