[automerger skipped] Merge "Use optional for nullable types" am: deb7085453 am: c63694c6e1 -s ours
am skip reason: Change-Id I98549c8614c9152d5d45e2f1f33f2f3c31a9bbbf with SHA-1 4fcb707ecd is in history

Change-Id: I333576d11d8782d4b379403459d7cb5b870a9866