Snap for 4429331 from 15d847b9d52ca42ea90f016db93d795704de2da7 to sdk-release

Change-Id: Ib7b808853a2c3265f92f1061edeab7bd836591a2