Merge "Add hidden API for pre-authorizing URIs." into ics-mr0