Merge changes from topic "flicker-read-write-refactor"

* changes:
  Compatibilize tests with new constants
  Compatibilize flicker tests with flicker infra refactor