Merge "Merge "Fix a deadlock in system server" into nyc-dev am: ab0744344d" into nyc-mr1-dev