Merge "Update framework code after new ART options." am: d7d2817ade
am: 9da4055766

* commit '9da4055766fc7acf81dcd238204589ea1f484d50':
  Update framework code after new ART options.