Merge "Fix LinearLayoutManagerPrepareForDropTest test names."