am ae38d425: Merge "Add -no-integrated-as at local level."

* commit 'ae38d425fdb3e3fea015c161d635d631172350c3':
  Add -no-integrated-as at local level.