Merge "Increase file size limit."
am: 76ad2405b4

Change-Id: If8ff614270204e6361fe95304dbc48494a3df2e2