Merge "Add semantic tags to license info text"