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

* commit '3f9c56dc6d4616f0d4efedaa46308868e2a38b6a':

Change-Id: I295a96e74af37ccb6950736791bdf34c447e956b