Snap for 6511343 from ffbf04411d222e3f38a1678934915ef03af79c2b to studio-3.7-release

Change-Id: I87c27c2e5225f1530d73f9adf253108af9f0f8a5