Snap for 7229773 from 6bb5004f6a7711cf8899214e135e04c369322859 to sdk-release

Change-Id: Ic422ab40f1272b3c5c04cf7ebca76086f1cffd01