Merge "Marked nullable in setter argument" am: f5bc344375
am: 2f0ad7bfd6

Change-Id: I02525e27fd9b4da474ff15bf502c49626ba079d2