Merge "p/Separate-armband-repo no longer needed."