Merge "Use optional for nullable types" am: deb7085453

Change-Id: Iea4d8e042d65e2ed1befa6dc18c822f2982c41ab