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

Change-Id: Id9e5e3277c94b9c0e19178c4494ee7eb8c382fcd