Merge "Suppress unnecessary error output while creating system cache directory" into...