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

Change-Id: I01d49673821f2f0b67239d9384785641ef85ade4