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

Change-Id: I8428c743bf607a096674aa84cb8eda1929b55d84