Snap for 10929834 from 0316ec7373f5738d4a461291407635d5500cc414 to sdk-release

Change-Id: Ic918dff9fdfb97dd7c789177e3fb128dbab6cf75