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

Change-Id: I51a61188186026eac5c12f3b0d0ec52eebf60f38