Updating to final API according to  http://developer.android.com/preview/index.html