Snap for 6686656 from 2b0d80469fa72f35a080186692f1a029e80dc885 to sdk-release

Change-Id: I818a2ba1b4e61bb3d35de786fb46b31473671ed8