Fix foobar

Change-Id: 9c92fcc923
Story-Id: 68205904