Merge "Ports chunking/cdc from gmscore to AOSP."