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

Change-Id: Idc2dccabb41e26296b8cd6ffa31d42c811fff5fe