Merge "Copyright updates and small build tweaks during testing." into lmp-dev