Snap for 6405781 from 00e662588990034e7d08cedd79b65097fe19c8de to sdk-release

Change-Id: I1eace4f2c37720a0ee84bde7d4b570afd8fe95dd