Merge "Fix oneway complaints for face auth." into sc-dev