Merge "Merge "Fix PowerIncidentTest" into rvc-dev am: 36eeacc0 am: 77292924" into rvc-d1-dev-plus-aosp