Merge changes from topic "face-logging" into qt-dev
am: a0d2d2021d

Change-Id: Ie85601b82500059b9924873b6c5bc842a470eae3