Change-Id: Ice8ce203a52b918e1eddb56ea437d082efd634bc
bar_find is set as static because it's still being used internally by other functions. Change-Id: I2db8f0ba60cf01929ce2c63edd9859612724de48
Change-Id: I39e7b882caa98334636d19ccd104fd83d07d5055