Merge "Fix PowerIncidentTest" into rvc-dev am: 36eeacc058 am: c0d784e00f

Change-Id: I9ab3633a5a85ea203d98641abac828de8613d75a