Merge "Add API 24 to reference selector." into nyc-dev