squash commit of PM changes from AOSP