Snap for 6686656 from 1529dcb3efb7047638ef6977224f0804e1959e05 to sdk-release

Change-Id: If110c677773214fb4e308482fa6ffbf362d9288b