Snap for 7152399 from 14ffb5293683c81db83547b7d444c246b09d55d9 to sc-d1-release

Change-Id: I00e04b9df88a3746bf2c14a38585116777b807a5