Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev