Merge "Fix testPartialWakelock" into main