Snap for 4429331 from a49a95403f6b214f91fb9c6251dd7440d5069d48 to sdk-release

Change-Id: Ife7cd5df550a445ce914316062106773d4594dac