Merge "Only apply match if there is something to apply"
am: e6b83cfe5a

Change-Id: I83967a110621ea19d51cf55bfcf46eda9f2e010f