Merge "Regenerate API signatures to add missing nullability annotations" am: 0f5b246260 am: c7e4291429
am: 89aebd2c81

Change-Id: I7e57d1f393b72edf1beb385611fbbc06802fd444