Merge \\"Snapshot RemoteViews before releasing lock.\\" into nyc-mr1-dev am: ffc0d5153c
am: 18d0841650

Change-Id: Iad6d527d6e0a81c127b7836e231044aeb40f065c