Merge "FP won't wake device if daemon dies" into oc-dev am: e3d3ffcb19
am: 64d4e903fe

Change-Id: I2fd61cb1674a6cd1578d5989c76322a259d6ce78