Code cleanup

Change-Id: Ib7c8b0ad72b6c8e4363523d5eb674cca28283210
Add correct permissions for WiFi PM

Change-Id: Ifad73c17be776bde134409bb084dda8281b63561