Snap for 10929834 from 46e96844758592ebba0935bbc7757a4d460b9920 to sdk-release

Change-Id: Ic66772c89fe75b22e4eee05dc6d7c2a1653db8d0