labath added a comment. I am going to check this in to unbork the android bots. I'm happy to address any additional feedback in a followup. I'm also planning to come some unit tests for this class next week. https://reviews.llvm.org/D32600