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

Change-Id: I723289e8e48c57b9127b6b97ddb7cb24ab34ff95