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

Change-Id: Iee190e29d1ae4e45d716aaa55f152a636c7fc94b