Merge "Change string for drag drop" into rvc-dev am: e9190da9c4 am: d846bab2ac

Change-Id: Ia3f8e9c247c6a5810400371f96ca73978b1036ec