Snap for 11812660 from 659188034e89b2456c4cea7e38c80c28589dafa5 to sdk-release

Change-Id: I7f3711fcd0941b5f3ffa03c8be6ecd8cfdd28723