Snap for 7779910 from 9f2c62481f413f80c148cec3135d8bb4ff20645f to sdk-release

Change-Id: I1785b41341828918e9f0c0dfc534d6f40167b1f9