Merge "Update current API after adding nullable annotations."
am: c06c54662b

Change-Id: If2c150f68b79f990edc046cce6ccc0d5bd85b5bf