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

Change-Id: I8e8a8e9fe6db810790c5e8d201ead4957bc58f30