Merge "Fixed a typo that caused IntentReceiver leaks." am: 4cec25cd6f am: 0902a158a8 am: 84490f3124 am: 6ce5f6858c am: 20d7e79f73 am: 7daaa5dc45
am: 6ffba1bc5d

Change-Id: I3cf585456e96d9295d0e0bbc5e097588cff450b3