Merge \\"Add API 24 to reference selector.\\" into nyc-dev am: 398d088871
am: f44feb36b0

Change-Id: Iff60df549779cd1155a7bfeeb74aca5e546a31ad