Merge "Protect REFRESH_BATCHED_SCAN broadcast" am: 6eb62f8ee3
am: 9271f57c34

Change-Id: I3c66beb4f502d967992b2b2070fcb1068744edc5