Snap for 8554636 from 45b60823f602d6bab08bd58c364df8e4a04f0064 to sdk-release

Change-Id: I3fdb5305b6b80ac3e3459e6b67d49f08f00ef720