Merge "Log pid for writes to sys.powerctl" am: 2827106d7d
am: c1968fb0c9

Change-Id: I3912b76dfca15e9d49d6c657c5081745b163af1b