Snap for 5925869 from 0712e2a442364af77a0b1dda0adf922d1d1447bc to sdk-release

Change-Id: If0f64c9075cba57ffff5238c6ecfb146f222cb35