Snap for 7290612 from 9f003b5cafdbbd8c9649a0b12a54f0e9882dc85f to sc-release

Change-Id: I8b30486ababf840494b974a57a4f6d18097ba7a6