Snap for 5590969 from b16df51a98a78c031b0582db3db67e8038c773a3 to sdk-release

Change-Id: I0a8aa830ed5230eff97b54d239123aa4ab399679