Merge "Removing unnecessary definitions from library" into main