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

* commit 'c84a5057cfd70a06b66a95ad1fef7ff43205351b':
  DO NOT MERGE : Unhiding MSIM APIs.