Merge "Change to stub library"