Merge "Don\'t overwrite remote views with null values." into nyc-dev
am: d56f39a37f

* commit 'd56f39a37f1655da44e962b177730c106710bed5':
  Don't overwrite remote views with null values.

Change-Id: I7d2716ec44ef2143fe1a0b58ec539607eef88a86