Snap for 5925869 from 2b75643580e1a1ad3086ad52ec6bb33ac04d82ff to sdk-release

Change-Id: I160778e300cb767a72062a9e71c0ab8a83bad649