Snap for 7915781 from 9243eff9cafbe6c03d9749db006a55a534acb58a to sc-d2-release Change-Id: Ic8fad79360767ef614428b5a19e85888e2bca92f