Merge "Add hidden intent extra about service availability" into nyc-mr1-dev