Merge "DO NOT MERGE Invalidate D&D operations when destination DocInfo is null." into oc-dev am: ef8e6bed5e
am: 9505c4f882  -s ours

Change-Id: Ie698f3c45b1f1805a62d144b0c9001c0f055f746