Snap for 5590969 from 12cef6ec8d8048d02ff3f74b36d6f87172cb4e5e to sdk-release

Change-Id: I1494f0ce8b9b8402cf1f0a6f5f7763a05f4be3c7