am 4da9196d: API change - bug 3370353 and bug 3370338

* commit '4da9196dd096cb0e5d6a34b0a87f2dbd6aa8578f':
  API change - bug 3370353 and bug 3370338