Snap for 7035284 from 24091446dbe9208d2459e9994c5381d2d39276e6 to sc-d1-release

Change-Id: I41953ba0d221bca41c63cc4bdfa70ce1565a6c75