Merge changes from topic "gentle-header" into qt-dev
am: 31b02a613f

Change-Id: I0748e65953628a928c073ee019f90ea054cd1d86