Snap for 11630439 from a146e93ab5506c1932fe33ed1849c745ec4f275a to sdk-release

Change-Id: I3b17707d9a8907298bfdb8386e64f64dcdeb5fb7