Snap for 10929834 from f22923891787ada5e0c6d71678e4904aacd04f8d to sdk-release

Change-Id: I4db5aa698af76e294d22eb7bdc5e6eee7f03fabc