Merge "Unhiding MSIM APIs."