Snap for 6793014 from 424180bdc4aa18249e678daebfd0fcf9365f6e5d to master

Change-Id: I3cd190b6b7831aae29c3b0ff5bd9a4ce2e6ba845