Snap for 6849520 from e147f93df617ad1db123d1fd42c780a2f6c72aa7 to sc-d1-release

Change-Id: I29a3f53959f6fc1f1e6b9fd09a7d457814719dc2