Snap for 5925869 from a11dadafec50be84dbc18d89c718efd63395b01e to sdk-release

Change-Id: I6ba3b2d205122f188584d2483049f2c6c2221429