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

Change-Id: I189e229115a2106a7a9826f4109f0194d2b1f061