Merge "Update BUFFER_CACHE_MAX_SIZE" into udc-qpr-dev