Snap for 6441286 from 39139a4b4f41484a11d3adb690413ceecb425049 to mainline-release

Change-Id: Ib17d9f4f753d83ff0206df2b5c0a5b6c742f3087