Merge "Correct sendBroadcast test" into pi-dev am: 587cf4105f
am: 086d117ed2

Change-Id: I761b0b4bf72aa4443c653d244b4865dbced37a1b