[automerger skipped] Merge "DO NOT MERGE Implement USB High Temperature...
[automerger skipped] Merge "DO NOT MERGE Implement USB High Temperature warning dialog(1/N)" into pi-dev am: f147660c
am: 5709582a -s ours
Change-Id: I9c97681c83a183642027b2d6e2dc2d6c13ada519