Snap for 6290619 from 53b155d5d7113aebaab7172668e8e044210d8f3b to sdk-release

Change-Id: I4b1e1caaeb6dbae0b75bb0031a10936dfdf1334c