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