Update for new android version