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