Merge "Run abandon() in the system server context"