Snap for 5735642 from c2eb64586d6dfc0f067ea66631b38d1922a106ed to sdk-release

Change-Id: I613d7ec303e2d85f1adfb8ee04cd918ea4cf9f0f