tree 8072f445587a5112e29c43013cfdddf0c496a4a6
parent 1b4e8b7263d81d4da5b78f8a27ef374e2061166e
parent ca6940754e254cf88e3371e0a6fdf18a1417040a
author Sasha Smundak <asmundak@google.com> 1583363002 -0800
committer Sasha Smundak <asmundak@google.com> 1583363135 -0800

Merge remote-tracking branch 'upstream/master' into upstream_merge

* upstream/master:
  Fix bug in buildPropertyMap in previous commit.
  Fix missing dependencies from mutators

Test: 'm nothing' runs internal tests
Change-Id: Id1b9ae002e62351a8ec0d27c249ca25ef949ff5f