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

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