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

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