Snap for 6660490 from d2ac860fa64716566fa046827b9364e9422abdeb to sdk-release

Change-Id: Iadf9bf660b85da2b4213c8d164bfddbeca86968f