AMENDED AND RESTATED PLAINS AAP, L.P. CLASS B RESTRICTED UNITS AGREEMENT (Tranches G and I)