am 2aaccfe5: am ad0ff1d9: am 4fceda2b: Merge "Add -no-integrated-as at local level."

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