Bug: 30642749 The 2 classes are almost identical so I'd like to just merge them if there is no specific reason for keeping both. Change-Id: I46af41388e25abf79066ff25bfb793cdef2e06ea
Bug: 30642749 The 2 classes are almost identical so I'd like to just merge them if there is no specific reason for keeping both. Change-Id: I46af41388e25abf79066ff25bfb793cdef2e06ea