Merge "Codebase license scan results, May 2018"