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

Change-Id: I3ed21dbc86c56ab1a9182607bb7bba7bbc73229e