Snap for 12349386 from a97c2a1f0a796dc32bed80d3353c69c5fc07c750 to sdk-release Change-Id: I83624a655b0f55322b3f0ec767e25c64bbc94e30