[automerger skipped] Merge "Specify default image block size of 512KB by default" into qt-dev am: 6e0bc978 -s ours
am: 1166d7f1 -s ours
am skip reason: change_id I172935c8dd9c729199d9015e82487f84018bb9f4 with SHA1 6cbc3899 is in history
Change-Id: I9cf01ec0089740aeedb359007982f7e89900e72f