Merge "[AWARE] Fix javadocs for match filter update"
am: 7241d28826

Change-Id: I67b2798b0eb1bc7e4ccd727aad9e761da49a8823