Merge "Fix issue with protected broadcast declaration."
am: 0da19daaef

Change-Id: I64b34c0382c1804817e402006774e1c6c6910264