Merge changes I5f425928,I397d361f

* changes:
  Define stubs_defaults for the new API surfaces
  Add SystemApi params to framework-module defaults