Merge "Removed unused Face Unlock string" into mnc-dev