Merge "Increase the bytes per config threshold to avoid too frequent uploading." into pi-dev am: e442db3e40
am: 80c93aed29

Change-Id: I9580a5cdccda24c7e5d7c586e783be90703c3de0