Snap for 5590969 from 968214c6ee563b082dfb95982b651a0f16710c26 to sdk-release

Change-Id: I238bb31b3fad212e3b84a6adbf8be8b86289f051