Merge "[pm] remove reference to non-AOSP word"