Snap for 6290619 from 4706e793a3e24e211244dc48a5049cb8f767c3e9 to sdk-release

Change-Id: I559b4e2bf72ac003d33cee759765cd49f0b861a8