Merge "Adding advanced pattern support to PatternMatcher" into nyc-mr1-dev
am: 4a0b061ff6

Change-Id: I5b420cc8f98553f0bafc6b60c6a8f9f79bfbee7b