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