Merge "Unbind MBMS service after calling close" am: d00563735f
am: 657c80a322

Change-Id: I04a3ce092c49d4920fa7b35926c1b47d520e03b6