Merge "Catch IAE from unbind onServiceDisconnected()" into pi-dev am: c83cf90166
am: 0f95a94940

Change-Id: I2097f145026be9d72c4d920e2567ea7cc6fe5589