- updated based on refactoring in the android utilities library