Merge "Merge "Clearer message when face auth fails" into qt-qpr1-dev am: 298994875d" into qt-qpr1-dev-plus-aosp