Snap for 7140885 from 0f2accf834cef1d967db0b082e5f805f23b5f46a to sc-d1-release

Change-Id: Id321463018fb6928b680b2b40e0a3b8d70c38fec