Snap for 5925869 from 90ec1d6e7ee5c236f62e0a374a7065657ed3c15c to sdk-release

Change-Id: Iad744f98968553fd93279ea0debfa9ff2702a24d