pmtpa s5 master swap

Change-Id: Ie9a96698e8539c9ff5a7f371cf44f083ddb0d59a