Snap for 6290619 from 0af6612e1b95d523f6120fa86af50a5c0c8297d4 to sdk-release

Change-Id: I693b84180f16acab1d5f7f004771705761791924