Updating for android r22