Snap for 5798008 from 26f8b8cdb20f94473eafafb94d534979cb46e3d0 to sdk-release

Change-Id: I92f1adb23f990164d615ec1126bdede057c6b4ba