Snap for 7602078 from 00e8ac6cdac954f063b584fbb821ea794c5e381a to sc-release

Change-Id: I2ddd1a6224f338bacef2525465d061ac91b5eb51