Merge changes Id14371f9,Iacde7f84 into oc-mr1-dev

* changes:
  Fix CC handling for no large object space case
  Add --avoid-storing-invocation option