Snap for 5925869 from f83658f8b9f7efd85af695bfdac0f00eeacfc5ed to sdk-release

Change-Id: I23f907def302ac453bb62da67f5221fc6421a86c