am b17cb363: am bbde565a: Update call settings to mocks

* commit 'b17cb3637934e495b1c3ca25514741e2a325e05c':
  Update call settings to mocks