Merge "Remove @uses annotation from XhprofDataTest"