Snap for 5475808 from 001a126f8b054ec8541e04470c15a23d6a707260 to sdk-release

Change-Id: I6a1f3a223330bee8795cca4971796816595bfea7