Snap for 11699450 from ae97b9296bfcd8513eef5877e02f486458027df7 to sdk-release

Change-Id: I320a4bdaaffadc38034d75a828dc95babaab1957