Merge "Avoid onServiceDisconnected() for unbind Service" am: a37c252248 am: c38e0f19c1
am: 2a126b05a2

Change-Id: I07e998923f88b3dd6b3c53ed74b0ed7deb14c08c