Merge "Add post resolve property values" into nyc-dev
am: a8d21a0

* commit 'a8d21a0facb415ed085059298c50eaa58544129a':
  Add post resolve property values

Change-Id: I6f2c2f086a680dc82a02450b891e1d9de8885004