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

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

Change-Id: Ifd7b22af2acda85284425eba9553658ce5bc138c