Snap for 6290619 from eba4cc5b98798e46c3f80b9dd0bdbd92757e4dde to sdk-release

Change-Id: Iaf2aecc20d9cadd0bcfb11730a192b544384eeed