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

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