[automerger skipped] Merge "Use optional for nullable types" am: 12ac74a11f am: 3645c3f621 -s ours
am skip reason: Change-Id I90cf2ce1193c479179687d71a5c1416f6cdf0b16 with SHA-1 605e39f5fd is in history
Change-Id: I4de40290cccab9a55ec0f08c0ab1f020f4eca05e
This commit is contained in: