Snap for 7149879 from 1ec8aaa9205bfb74411a9d1602da2bad59db92d2 to sc-d1-release

Change-Id: Id29839526dd2c86040251f4a9bf27264ce0d5a4c