Merge "Use optional for nullable types" am: deb7085453 am: c63694c6e1

Change-Id: I29d0ba8265692bc7234b4f72cd1c0fd0324c8834