Merge "Use SPDX 3.0 license identifier"