Merge "Protect TRANSFER_COMPLETE broadcast"
am: 1be1934e81

* commit '1be1934e813289d1ce1c238b09161c1e223b7350':
  Protect TRANSFER_COMPLETE broadcast

Change-Id: Ibe4fa7e639fd7bf13275417159c5c6a14d1e369d