Merge "[AWARE] Fix javadocs for match filter update"