Merge "Move utils to staticlib" into main