Snap for 7574892 from 3c20df39d0eb77c85218f3bb0d3ed5ef6360a3ef to sc-release

Change-Id: If34a978eb3a582d1c1ae3a6f085fddcb41f2f892