Merge "Account for crop in checksums" into qt-dev am: 089d89c404
am: 3b53514365

Change-Id: I05182b0d1bdf8a5850ca2b404c7f2cd54efed6c1