am 40bd4ef6: am 49de87a1: am 80a3fbf4: am c9eb398a: Merge "Clear identity when killing media provider." into mnc-dev

* commit '40bd4ef6c35b7a47353de6071b02e51bf04ce0f0':
  Clear identity when killing media provider.