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

Change-Id: I66737d8a07f8147a5929559f79cfa6d8a4780881