Merge "Merge "Don't crash onServiceDisconnected..." into oc-mr1-dev am: dab9eff8" into oc-mr1-dev-plus-aosp am: bb268b9f Change-Id: Iec740e8d40db93eda07e548e097a8cb7b0c4e3b0