Merge changes from topic "cherrypicker-L44800000956574234:N57400001298548834"

* changes:
  [automerged blank] odrefresh: Ignore some system properties. 2p: f889ea6da0
  odrefresh: Ignore some system properties.