Merge changes from topic 'b/26301726' into nyc-dev

* changes:
  fix attention test
  update CTS instructions to relfect new settings structure