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

Change-Id: I922cb82b69a13913d83280d1003e292528bdfd88