Snap for 8140651 from 302cb50dc2dc18933d58046950410a95ba4b6ca2 to sdk-release

Change-Id: If981ebca3419498941d9cee3515c9f921818e7bc