Merge "Use optional for nullable types" am: 0e49bfa809

Change-Id: I0a4adc474ad910bb24a7ebbed6a4c6e3f9862128