Snap for 6435660 from 3c640bc02706768a64797b2167b6dfa9c54cd796 to sdk-release

Change-Id: I26271686112acf3df7354f9ea81ef5bbbab51206