Snap for 6355086 from 9906b4bd3c9ea55baf1c5a648c37ab8fa6ecacdd to sdk-release

Change-Id: I9de9edcf02db9d013231c74723957bd906c50a9c