Merge "Marked nullable in setter argument"
am: f5bc344375

Change-Id: I6eb379b487e85e4523227938a1f1c281b6b1a8ce