Snap for 6290619 from 436325eb5c8fbe70975fe0546afe88d5288ff3ec to sdk-release

Change-Id: I6a28ff0cf4ff50662804a5550b5ba75f5ce1f459