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

Change-Id: I0a094416e0eaa1b09ec964cba3ec889ccca35eb6