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

Change-Id: Ic0adb77a52c91d6489797ba5bdb73ea1c020c8bc