Snap for 6290619 from 73aa04b4639688674712d18b65b3121a7f49e20a to sdk-release

Change-Id: If979659aa0ac18654781c50ae2194bc709411590