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

Change-Id: I2ec1f07eed98db98ce997eb2a35a61e9e497a29d