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

* commit '09aee00836c35c2970d0e8ba4563fd256dfb1759':

Change-Id: I3b4183aba7213969c7c22c64b806f47aa5467122