[automerger skipped] Merge "Specify default image block size of 512KB by default" into qt-dev am: 6e0bc97875 am: 0fef2ff79d -s ours
am: f4560f1a78 -s ours
am skip reason: change_id I172935c8dd9c729199d9015e82487f84018bb9f4 with SHA1 6cbc3899b3 is in history

Change-Id: I1275909b0539f6236d91c07c75eec69963933c73