Snap for 7384269 from c3e6383690c1681bf3943e7b8971a4299f686a05 to sc-release

Change-Id: I63b731e6c6b7a65af3e2feec4894cc393a1e6660