tree 4732362932f7e6b6c17d59c17c397d05590d1a2d
parent 128ede2a63e38e91eaedb8a7bf0556bbdb1377d9
parent 3c185928853f663200826112de82987bc7d2c3d5
author erfanian <erfanian@google.com> 1530298910 -0700
committer android-build-merger <android-build-merger@google.com> 1530298910 -0700

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

Change-Id: Ie4c16e55ad06528882ef43ba86cb30995cb49db7