Snap for 6877830 from 0e2a02db30d95dd2bef16302e67a38dc5844431d to sdk-release

Change-Id: I50e47218a034abb19a351cd66ef2eb5384afcd75