A cherry pick from 49a13bf for gs101
Bug: 199252036
Test: Boot to home and usb hal bring up normally
Change-Id: Ia4e344aa9cf7762b71cbfe35ff9cbcccb4474b11
Bug: 189703449
Test: read contaminant status normally
Signed-off-by: Albert Wang <albertccwang@google.com>
Change-Id: Iff31b2846cec2e960e5c5db83371ca3e983a4a3b
This reverts commit 72ef08cafa11ab10bc31105c70836cef92e1f7b4.
Reason for revert: using alternate method for original behavior change
Bug: 187261232
Test: build pass
Change-Id: I5643a4109f6e4a64d167ed9ee1ce0bc3492cea42