Merge "[MS03] Remove ServiceNotFoundException hidden API usage"