Snap for 5735642 from 81dd5055b1e1b1891e26e08c94817d05ccf6c44a to sdk-release

Change-Id: I7718e66446664327d69bd1dd6e79ae46a3936060