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