Merge "Use getTargetContext in SystemFeaturesTest" into ics-mr1