Snap for 5590969 from 74ba8f0e03f8b662b961ff7b904690c2d1302325 to sdk-release

Change-Id: I1a0093f850508f60b6bcdbcf588daf3ff0b9db92