Chunk updates at 10

Bug: 62358
Change-Id: I9980914a4e130b6a649668c1fb2b1558fef402fd
Merge "Chunk updates at 10"