Replace if statement with call to Option::map

This CL replaces an if-statement with a call to the Option::map
function.  Having manual implementations of Option::map became a warning
with the 1.52.1 compiler update, and this was promoted to an error by
the build system.

Test: TH
Change-Id: I13e4adfbc84fbe855fd7d573e43e65bf602e0a5b
1 file changed