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

Change-Id: I5c69b1d676d20a9d339a2dea635f07ab2a319638