Merge "Address comments in moved sharedlib code"