Snap for 6435660 from 4801a3fe5ad039cb5817f5de2e579c150de76cad to sdk-release

Change-Id: I668f1275c65818252e24d9b44fc3db12bac87cbb