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

Change-Id: Ic07dfa9b8f07b8075b801447b8ba0107f180195d