Merge "Fix Robolectric failures for new registerReceiver security design"