Snap for 7800789 from 88ac44955f69cc24e5042b38ec2dc4b242ecd61a to sdk-release

Change-Id: I45cad4205f7cb31407dd5e4684be1cab57d98179