Snap for 6877830 from 8ba33eb34ba0c0acb3cc9273eadc34ed1ff9047b to sdk-release

Change-Id: I4661e07c4396d136927119afccd731a5860f2f95