[automerger skipped] Merge "DO NOT MERGE Fix flaky tests in OverheatAlarm feature" into pi-dev am: 6d19f33ca6 -s ours
am: 9646e08b3f -s ours
am skip reason: subject contains skip directive

Change-Id: I5818d275a7b9f988049c8118dbeeb0d82a15672f