Merge "Give fg services a shelf life before they go bad." into oc-mr1-dev