Snap for 6290619 from 894b033578235e26acbb45e5fb65e93b3bdae60a to sdk-release

Change-Id: Ie6ef4cf07205f72997e5bc3d9f362727faab4d10