Snap for 7266196 from df1b107ad9f21e23977ba5e1615b0b10d0e9d4a9 to sdk-release

Change-Id: I7b924abcd4c0eda6245cd9d4f60e32cc0dd5fd69