Merge changes from topic "filters" am: 2b505cd0ef
am: 8173631720

Change-Id: Id63703e337a77c91ff3acc9df0b1cea6ba096a17