Merge "PowerManagerService needs yet another flag..." into gingerbread