Snap for 9679998 from 5dec8792ef564a80b690efe26377ab7584623a20 to sdk-release

Change-Id: Ia3ffcf0488d33f8d2bd8baa4dca7074723db025e