Snap for 6431500 from 22dcfe8c41c2cf1c12b38b05590556eefc673588 to sc-d1-release

Change-Id: I3a729a4c0c70a2a80bac0c884cbd2270e6c9ee5e