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

Change-Id: Ia94d4ea44e9e06864a5cd701630ce162217d591c