Merge "Fix leak of registerReceiver"
am: e96e74f939

Change-Id: I73cdb8cad5b975cfe374b2d0b78b3e9ca9b5b9fd