Snap for 5475808 from bfe0f47fe1d6806b929896d60fb4916f642f1f50 to sdk-release

Change-Id: Ib0dee1b5e8f490982dde92f449045af677c23cdd