failing on Chrome, need some when_present statements

Change-Id: I36ef567efa5aafdb356df76dbee55e50a3ec9768
Merge "failing on Chrome, need some when_present statements"