Merge "Remove more instances of guava optional for built in optional."
am: 3c18592885

Change-Id: Ie4c16e55ad06528882ef43ba86cb30995cb49db7