Snap for 5925869 from 45d923c40605a71867d174abcd04a1db76945651 to sdk-release

Change-Id: I47d9c9ea233e3abd1e3836bc55b187cc0ab1fdaa