Merge "[MS19.1] Fix several hidden API dependencies"