DO NOT MERGE : Unhiding MSIM APIs.
am: 3fca60eb8b  -s ours

* commit '3fca60eb8b4457fc24d03211388a1b1821d8b79b':
  DO NOT MERGE : Unhiding MSIM APIs.