Merge "close a potential race condition in registerAsSystemService" into...
Merge "close a potential race condition in registerAsSystemService" into nyc-dev am: 3b016f54 am: ca925148
am: 7f251126
* commit '7f251126':
close a potential race condition in registerAsSystemService
Change-Id: Ic9d102dcf92377e332430418bf68cbfd08d0d124