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

* commit '5d5f055eb6783dceb51cdb71630aac40feacfedd':
  Update framework code after new ART options.