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

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

Change-Id: Iefdf3b5926d39a7816b75f844963f42624846344