Merge "Update current API after adding nullable annotations."