Snap for 11841552 from fc6ef30941130833ccd2afb4efbcac642738d9ef to sdk-release

Change-Id: I73f64e471f925f29f3e5696c1c6c60790ab76cbc