Snap for 8554636 from 0b8e3a3cda9b09d71987bd0f3bf590ac4b0cb91f to sdk-release

Change-Id: I2da339726c807dd994641f6584d46dddc70f5a93