See if we can step down to API15 instead of API16

There might not be a reason we are using 16 instead of 15 so it would be nice to try and step down.