finish up adding support for p31xx tabs

Change-Id: I652717d76a6b7406eeb7ec4aca91e6cf805f50a2