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

Change-Id: I714a2cf86ca10dfd2c71e7d0ff3d352bb78e9bc5