Snap for 6686656 from e1a834747d201648e0e7e667194dfa0e98c9bed7 to sdk-release

Change-Id: If1f6dc833a3173ddef0e41def4f200fe72742d22