Migration to AndroidX #2