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

Change-Id: I1e1f1605fd099be09da5c579f2ce649964e3677d