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

Change-Id: Iff263c19547757980914cf9afa9abc7294aca316