Merge "Add filter ordering" into nyc-mr1-dev am: 295f5108f1 am: 425d4f6c0f
am: 1ddd71b15c

Change-Id: I8adffbabf0a5b5f873f07cd57bcbb69919f41f4f