Merge "Fixed power manager CTS test." into pi-dev
am: 15d35c1274

Change-Id: I375d0d77520a707cc76064a93def15faa5f8ddb1