Merge "Fix subplan filtering" into nyc-mr1-dev
am: dc40ec370b

Change-Id: I86a2032346d91187e5676353c3366a4bf5b9d83f