Merge changes from topic "face-challenge-bug" into qt-r1-dev
am: 01462c0b95

Change-Id: I86587feb4d6a1e845cf605c8e5b6536d10f1b479