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

Change-Id: I4571a1c1049eecda9d38dd329b384ac9bf6bd9ad