Adding advanced pattern support to PatternMatcher
am: 2baf095ca9

Change-Id: Id4e05a79797af961e6505715b69da4319f2042cc