Merge "Merge "Fix a deadlock in system server" into nyc-dev am: ab074434"...
Merge "Merge "Fix a deadlock in system server" into nyc-dev am: ab074434" into nyc-mr1-dev am: c4a41245
am: 34306764
* commit '34306764':
Change-Id: I6609a2f3d6bf9f65edf5cfe03b20eb3d59c857a2