Merge "[AWARE] Fix javadocs for match filter update" am: 7241d28826 am: 65617f21bf am: 4c43aba36e
am: 4f6b7f87f8

Change-Id: I5c15d5915d5fd7ce84d150986af1f8d45b9a65dc