[automerger skipped] Merge "DO NOT MERGE Fix flaky tests in OverheatAlarm feature" into pi-dev
am: 6d19f33ca6 -s ours
am skip reason: SHA1 6d19f33ca6 skipped by user lbill

Change-Id: I806bc8dd36c81ad3ffa1cd52dc91d929fde5ab81