Snap for 8554636 from 97a3595670c570ce34014f682c6d02a870b95594 to sdk-release

Change-Id: I9cac549047ca0bde583891eb9975ba68b4ee4773