Merge "Return complete properties map instead of per view" into nyc-dev
am: e70464e

* commit 'e70464e11694712d62092ac3a623c32fe6d5e8a5':
  Return complete properties map instead of per view

Change-Id: I40f801e0f1daa9240af11d93dbe52cc17bd29ac8