PM layer cleanup.

Change-Id: I6d47faa0c33550b7aeeb37edbad69f64dec556d1
Signed-off-by: dekehn <dekehn@gmail.com>