Snap for 11541002 from 10ede790c557c689dd9c58af4398747bed6ffba6 to sdk-release

Change-Id: Ibeb5979d7e09c65b884a828d26337d249b8ba531