Added Android L support