Snap for 5925869 from be4fa9eb05f3e640647e30454b6f1c2625c34811 to sdk-release Change-Id: I677372d0785a8a80dc22cdea8949f7f1b024cb92