Merge "Fixed power manager CTS test." into pi-dev
am: 62444d4950

Change-Id: I96d0acccf64a86a241178241dc6fc9b069f29ac8