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

Change-Id: I6de8a5f2eba41dd3aba306a79fcdb32acb9cc80b