Merge "Work around issue #32096507: 'am send broadcast' fails the second..."