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

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