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

Change-Id: Ie43bee805786474878c41d8d69aa1d09da413810