Remove set of PATTERN vars

Change-Id: Idc2e1e3c5ac37e26179a2f862df9c5f5f4cebf60
2 files changed