Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev