Snap for 6877830 from b6b0fd7151e66d8b10e3efbaa92a1c6849763d20 to sdk-release

Change-Id: Ifa5de54fc6a92672aa9c2cea45e17486e4252d56