Merge "Unrestricting app when put on power whitelist" into pi-dev am: e70e27ccea
am: d47817ffcb

Change-Id: I488c11a04f7350c96c71ca70d1122c7de7b27833