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

Change-Id: I787be32af00a25c5a22e4e8fa6f7f57d34f48da1