Merge "Fix ordered background broadcast API" am: dd6d0b26af am: 950f73800c

Change-Id: Idf232eb4ae82d1e143b89d713294f8e762a048c7