Merge "Splitting over-the-air downloading into batches" am: 89a3f05238 am: b200b59f38
am: 14dc548573

Change-Id: I9df3cdfdf42b755db5655a2e572f8b70741e8320