Beta: Remove pmtpa reference from comments

Change-Id: I97d67cc4e386c566f02cac6897d92158ba4f2249
Merge "Beta: Remove pmtpa reference from comments" into production