Merge "Add new API to set URI on AssistContent." into mnc-dev