Merge changes from topic "face-bypass-move" into qt-r1-dev
am: ffcc25ba92

Change-Id: I787f5858cefad29869bcae364a0b1f1a4aa9cc4c