Merge "DO NOT MERGE Fix flaky tests in OverheatAlarm feature" into pi-dev