Snap for 5925869 from fb31d0b0d90ce27047c575c7cf7bd187d9df36e4 to sdk-release

Change-Id: I42452529f2db745348d74ebdbabeb5913526a374