Merge "API for CDM wake-up opt-in"