Merge changes I4a907600,If3205033

* changes:
  Marking used instant apps fields as System API
  Revert "Revert "Removes EphemrealResolverService and related""