Snap for 8554636 from 053373fbcf38b75bec82c67ac23910dc3cd97ae0 to sdk-release

Change-Id: I2811a3c29bd292575e4bc62b7fddd3e6d79925fa