Merge changes from topic "filters"
am: 2b505cd0ef

Change-Id: If3b8ea04ddc822dde903223fe663a82ecd81027a