Snap for 7800789 from 0a0604336d4d1067aa1aaef8d3779b31fcee841d to sdk-release

Change-Id: I88f6dfdc62d82b68ee4cd6e4b936536dbd7620c9