Fixing broken accessibility drag am: 9be9936653  -s ours
am: 4240337e7f

Change-Id: I47f5f939a1cc2263060e08ffabb29e105731f756