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

Change-Id: I5301bdfa1ab6f1468ddfd587e9cd875a1351424b