Add convenient builder method for Optional

Change-Id: I9b189f1fe530a36799c134902684043fd2285f75