Merge "ktlint fixes" into qt-qpr1-dev am: 34c392a367
am: d4a9584f93

Change-Id: I60cd5e0efb546f42680f77b4501e82408b1a8130