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

Change-Id: I2956e70ac348075732890b490c44e662f0c9f455