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

Change-Id: Ia67a7808e1eee34f5c2a30eac25d51835cc3e2ca