Merge "[MS31] Fix several hidden API usages"